From 5e25bbb2aebba5d3e05f4f45fa1bdf3f47df11ae Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Tue, 1 Jul 2014 15:42:32 +0200
Subject: [PATCH] Adwaita: no border-right on treeview-derived widgets

I fear to be opening a can of worms, but it does seem like
something the system theme should deal with.

https://bugzilla.gnome.org/show_bug.cgi?id=731463
---
 gtk/resources/theme/Adwaita/_common.scss           | 5 ++++-
 gtk/resources/theme/Adwaita/gtk-contained-dark.css | 2 +-
 gtk/resources/theme/Adwaita/gtk-contained.css      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 3fedcf7d93..365b6d9686 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -758,7 +758,10 @@ column-header {
       color: $fg_color;
     }
   }
-  &:last-child .button { border-right-style: none;  }
+  &:last-child .button,
+  &:last-child.button { //treeview-like derived widgets in Banshee and Evolution
+    border-right-style: none;
+  }
 }
 
 %column_header_button {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index f4237439f9..ad800ef403 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -975,7 +975,7 @@ column-header .button {
     box-shadow: none; }
   column-header .button:active {
     color: #eeeeec; }
-column-header:last-child .button {
+column-header:last-child .button, column-header:last-child.button {
   border-right-style: none; }
 
 column-header .button, column-header .button:hover, column-header .button:active {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index bf6a1ed13e..e43fae0150 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -975,7 +975,7 @@ column-header .button {
     box-shadow: none; }
   column-header .button:active {
     color: #2e3436; }
-column-header:last-child .button {
+column-header:last-child .button, column-header:last-child.button {
   border-right-style: none; }
 
 column-header .button, column-header .button:hover, column-header .button:active {
-- 
2.30.2